Updated comment routing