Next pull request will integrate to storage related classes and update tests. This pull request does not use it yet.