Added groupId to config
Merged changes