Adds debugging and basic group support