Subtle change to keep implementation of customer as Event