added database mapping