Updates to support Contact edition