Fixed database mapping