Add comment logic and database support.