Refactored data accessor