Refactoring
Refactoring
Refactored default converter implementation