Initial support for custom resolvers