Finished switching operators to new types