Modified layer groups, added pits and pipes