Added support for extensions, imports and repeated.