Comments enhancement