Improvements on operation handling