Refactored converter classes to use Funcs