[zest-owtf]Database support integrated, comments and other small changes