Service resolver refactored