Created a base class for alternate client implementations and decoupled main implementation from most entities.