+ Using MetadataUtils / Removed Old Code & Tab Completers.
Merged cc43614c27e8d80a9560d8372125ed09d10a4624 with the new changes.