Add back ET and ElementBase references