updated property handling and path