Refactored resolvers