Converters refactoring