Pretty sure Oda will find some way to extend the manga even more, like where the supposed place of One Piece treasure, someone already snatched it away