Added support for random-start-delay