Add tonoRegistered flag
Fix invalid data type