Changed some dated types from "class" to "model", as suggested in Issue #11.