Move etype out