Refactor relationship actions into a seperate class