Added remapping of required paths