Updated typechecker to use new UIDs