Moved client buffer definition