Changed property_set to new structure (#7782479436281)