WIP - Implementing support for json storage