Added parsing for server+client commands