Enhanced handling of type collision. Now Inner Class Types are taken in count while generating the Imports.
Also ondemand Imports are supported.