Added startup script support