Started to implement annotations in C++ code
Changed wrappers to support annotations