Improve disassembler