Re-added defaults to comet mapping