Add tag to objects where missing, + add tag getter/setters to C++ API