Added new entity json parser