Map option improvements