Rework SignalHandler
Update vendors