Customer class tweaked