Added some helpers and template