Updated to lastest cppcomponents