Added templates
Added static