Added remaining Json entities