Added server that expects a buffer