Adding more types for extensions