Added all the new 4.0 stuff to the 5.0 rmap