Fix links
Add support for groups