Updated to compile with latest cppcomponents