Updated to support systemd