Small changes in Customer