Updated diagram/er model/script