Use Custom Configurer
Finish Hotfix-2