Updates to ElementType:: and to deal with mmRest