Add basic Grouping and interface