Add support for more than one fd handler, add timeout watcher