Add groups and sub-groups to user messages

• Add groups and sub-groups to user messages