Improve metadata API
More Metadata API changes.
Disassembler