Client - server communication rebuilt