updates to support v3 and move off deprecated API