Improve relationships controller