Remove duplicate classes.
Added support for the activation and editing additional configurations.