Add signal handling
Remove signal handling