Add option to switch off identity map