Added server support for comments