Updated to JSON callbacks