Added partial MoreComments support