Added more etypes.