Moved QueryableStore to core. Incorporated Oscar's comment