Begin migrating Entity to new template based approach