Changes to support map options