Added id as a dict to conform to new schema