Improved canonicalization
Added info structure