Updating models
Small refactorings and remodling existing refactorings