SystemBuilder refactoring. Moved away contact and link operations.