Removed templates and partials to make everything more generic