Merge "Add code item accessor helper classes"