Changes to support customer id