Fix: Allow overriding CID mapping methods
Fix: Allow overriding CID mapping ctor methods