Updated schema call, resolved JSON calls