Updated handlng of empty properties