Update code to match the updated GT API