Updated resolvers