Added support for media comments