Swap options and flags params for consistency