#23 added group relation to table and match