Added support for extensions