Refactoring ! Split up the BinaryClientImpl to keep it simple