Improve Operation encapsulation