updated model; need to update in serviceconfiguration, templates, controllers, and tests
fixed #8