Added changes to support customer importing