Updating property form.
Trying to fix the max nesting issue