Added relationship management