changed all old style XML objects to JSONEntity