add Database generator and clean up