Changed groupId to more appropriate name