added new features in datamodel and template