Improvements in the Promise handling