Refactoring models to get a normalized service instance