Added domain remapper and Unit tests