Fix syntax error
Better relationship management