Added support for driving aids.

Also some code modernization (HashMap -> Map, etc.)