Updated Impex with new components