Corrected model mistake and added relations