Changes in optparser