Improve operators