Agreed this is the right way to do it, once we get the data better sorted in the DCP, but for now it's a bit restrictive.