Add support for skip-name-resolve