Real support for Comment and Activity.