#537 - More templates + utils macros