Buffer store functionality added