Upgrade and unify units