Refactor
Added operators