Simplified storage logic
Fixes due to RingBuffer refactoring