Added support for comments table