Add BinaryOperation
Refactor: Extract method in then_block?