Refactored some resolvers.