Adding command-line context parameters