New components

Added new components. Reordered elements in type.