Improved multi buffer class