Refactored converter handling
Refactor validators