Add better default groupId