Added mapping and skipping as well as unit tests