Work on the Component Architecture WP