Added DRIVE and DoF options