Update the properties
Merge Migrator/master
Fixed the last of the bugs