Adding support for extensions