Improved grouping, passing app version