Update to new 6to5 api