Fix exceptions and pre adding the configuration extension feature