Converted more JSON calls to callback