Laid the foundation for the C++ item refactoring