Add AND, OR Operation
Add some changes