refactor the Model and the templates to have the application specific model available