Use injected store to save resources
Merge branch 'fix/data-store' into develop