Updated metadata queen
Updated metadata (added attributes metadata, added more global metadata)