Add comment and tag support