Add more signal handlers