Support for extra-sources in configuration, removing handling of null parameters as optional parameters [ci skip]