Updated codebase to temporarily accompany recent API update.