Add better support for required and/or excluded routes