Various updates on properties expand