fixes in Database files.Is working now.