Bugfix and Refactores

Bugfix: using generic types and converter parser
Refactore on converter