Adding converter infrastructure
...