Further implement component infrastructure