Added converter improvements
subproj changes