Added support for more upstart options