Refactored resolvers.