Added support to change customer