Adding option parser