Moved entities to a json-like format