Improved benchmark method
Setup Assistant new groups added