Added support for additional mapping drivers