Started update to JSON callbacks