UPdated schema