Added support for unset properties