Improve Operations