Modifications to systemd support