Updated plan/main and included conf.d files.