Updated for master branch changes.