Smarter Mako template to address MCKIN-321