Map options improved