Added support for additional conversion
wip