Add basic support code for CDC function