Added some templates and functionality