Move some more stuff into configuration file.