Changed way Client is handled