Refactored package to Group ID