Added version_mapper and unit tests