Added buffer class