Support for command line execution, locations, more