Started work on supporting multiple mapping drivers of different types