Move components update back to C++