Updated to work with the new schema registry