Added disassembly capability