Use a dict instead of an object to ease serialization.
Merge remote-tracking branch 'refs/remotes/ivan/feature/use-dict-instead-of-object' into develop