Added more component metadata from Irina.