Improved Group routes and functions