Add Assigner and UidMatcher