[Merging with kw701] Added the other Component subclasses