changed routes to use annotations