Refactor: Routing: annotation style