Issue #1 - added wrapper call to remap hosts