Speed up Groups feature