Moved expire_selector to Store