Initial fork - trivial, add groupId