more contact class improvements