Add support for extensions