Creating templates should be enhanced

Issue #90 new
ronenc
created an issue

The current template is very shallow. Need to be much more flexible solution.