refactor: implementing stores and code refactor accordingly

Merged dindigala requested to merge refactor/implement-stores into develop

Merge request reports