Generalised conf a bit more and added the rest of the datatsets