[ALOY-1148] Update model template code
Merge pull request #577 from skypanther/ALOY-1148

[ALOY-1148] Update model template code