Updated to use new JSON package code.