Adding remaining buffer class