Refactored how operators are set up