Add reload support
Refactor stores