Adding support for comment component