Added GroupConfig
Added wait and mode on UI