Updated Contact class