add skip-mapping to configuration and code