Added proper @Template annotations