Work on template features