added more resolvers