Marc: Customer class added