Added more parameters to argparser