Better support for Collections ect.

This adds a better support for genericTypes.