Updated to lastest cppcomponent changes