Annotation support for routing

Missing cleanup