refactor store handling, handle extension stores