Refactoring ValueConvertor