changes in metadata to make it consistent and to support the UI