Use mutually_exclusive_group instead of manual logic