updated property handling