Added contact and entity management.