Database module dependency issues are fixed.