Reflecting changes in the COMET-mapping project.
Please note that some compilation error still persists (not related to
these changes, though)