Add large NAND support and improve retirement handling