Working version for Impex (tested on uat)