change of structure to match DQM specificities