Updates for new schema and webservice return