buildings and property model added
merge