Prepared for world gen changes