deprecate --model option
two additional consumable referencces
externalize consumable references in a file
add a bunch of new references
fix test