Refactored to use an implicit Resolver