Added ContactImpl and tests