Added command line option -D and configuration parameter