Updated models with more verification and some scopes