Added the remaining model classes