Feature/template design