Add skip_model and skip_controller options