Refactored Client-Manager-Structure