Added some support for the AND operator