API are now in line with specification
Merge branch 'feature.mpeg007.driver-collector'