Added ability to set & pull customerId