Updated bh-property-helpers