Fixed import gateway
Changed transformation rule logic