Made identity map optional as its still quite experimental.