Refactored store methods