Template enhancement