Improving design for property group