Added check_options to routing