Splitted client and server changes