Update for rust master (not finished)