Fill store listing
Refactoring