9f84330 Updates several component definitions