PDIO-427 Update templates and EntityMapp