Changed retrieve_up and retrieve_CDS outputs to be dynamic files and all dependencies