* Adding some private contact handling related improvements