Added BinaryExpressionHandler