Re-add DocOpt