refactored data-store; added problem details