Add support for tracking and closing commet connection