Added has_property and has