Improved operation handling