Enhance template