Add restart requirements support, fix blank config on first generation