Factorizing some constants
Finishing the XAPI mock and the OSM one