Updated more references