Implemented further group types (#13)