added support for grouping properties