Reorg + guessing default types