Added support for default property values