Disassembler and DataBuffer enhancements