added identity map disabling