Updates; Preparation for C++ bindings