Refactored Converter. Added validator