#6 added property decorator to models
#23 added field active to some models