Adding TComment mapping