Group properties together (#114)