Add input parsing for client