Refactored data store and sample queue