Added support for pdc and various options