Add more intelligence to the DCCU parser