- Added entity json import and export