Minor updates for using updated JSON