Updated to latest cppcomponents