Slight refactoring of service model