Changed to track latest changes to cppcomponent