continue refactor in the Mapping2DatalogConverter class