Add args options for running from CLI