Convert Resolver into a class