Added proper templating