Current work on improving option parser