Refactoring property group in Match