Updates for new generator and such