Upgrade dependency to maps from _r2 to _3