Refactored client to eliminate inheritance in constructor