Added ability to use extensions