added support for extensions