combine enum and struct to avoid same comments add comments for mbus_context_option add missing parameters in comments