updated property name and handling