Updated to use Medea JSON