Updated grid generator with new terrain features