Added capability to export complete caiml.
Minor changes