Added Contact edition support