Added configuration options, still unfinished.