Un-deprecate some maps