Addressed Reference clafer cardinality issues. Not stable yet.