Re-added more specific resolvers