adding some stuff to support Customer