First steps of refactoring data storage system to be more explicit, easy to use with JSON