Added class with functions to return templates
Replaced