Adding store list and restructuring
A bit more