Moved args parsing to the click module