Source data update
Added automatic conversion
Data update