Updated for generic systemd system