refactored extra_value_source
* fixed import conflict