Added: infra for route options