Add support for entity templates