Enhance clients
Improve saving of systemd service