Adding relations, cleaning up