Converted remaining calls to JSON callbacks