removed unneeded class for buffer store
changed class name