Added resolvers