For #339: adding missing model definition, updating examples to more readable vars