Added key buffer class