Refactored store