added support for basic map and most map options