new json structure
some fix
update for property management