change some code for option parser