Move to using sigint package