Updates made for change in BufferQueue