Entities refactoring + small JSON structure change