Updated template for full ORM support