CompositeInstanceKey refactored