Add more sensible groups approach