Added support for start-up script