More route signature refactor