New handling of contacts