Update to use property decorator