Fix missing enum import. Fix cardinality extraction.
Enhanced collection support. Fix local file.
Various enhancement and fixes.