Added check on updating college mapper association