Revision of AssignComponent, Part 1