Fixed some relation stuff
Updated scheme