Added configurable extensions.
Merge branch 'feature/configurable-extensions' into develop