Added configurator extension
Added type hint
Refactored to custom extension and fixed