Updated API to use the common messaging driver