Implemented new templates