Updating based on latest GDK API.