Add comment support, DB dump