Cleans up connection class, adds groups