fixed model and added default values for templates