Made converter general.