Many improvements for Store collections