Updated buffer class