Added Resolvers