Use proper signal handling