Add support for custom NS resolver