Refactored Converter to make it more extensible

- Minor refactorings to make the class more reutilizable