Add factory for extensions
Add factory for extensions