Refactoring to allow for other route filters to be applied