Various internal changes
Added total conversion support