Add startup and shutdown