Feat/18/vanilla templates