Adding CDRS configuration, better handling and testing of the defaults