Tidied up commit from @ningosi
* Moved all concept UUIDs from MetadataConstants to Dictionary