- Changed to use the icommands instead of the API also for the metadata.