resolvers simplification and improvements