Added comet support