Updated to support addi