Updated cli tools to take a config file