Added more types.