Migration to tComment