Samples updated to new schema