New ContactDB Class

And partial adaptations