Update for rust master (not yet working)