Added dependencies on groupoids and groups