More general approach to options for cd wrapper