Moved store validation to Store module
Replaced LAST_ENTRIES and LAST_ENTRIES2 with LAST_ENTRIES3