Cleaned the configuration and extension definition
Merge pull request #194 from K-Phoen/clean-configuration

Cleaned the configuration and extension definition