Modified Customer class