updated and added database parsing