AD updated, models updated correspondingly
Merge pull request #3 from kromkrom/classes_update_1

AD updated, models updated correspondingly