Bug 10402: Move contacts to separate table