Added join buffer in server