Updates to CustomerClient