Update deprecated  helper and  property access