Add OR(), AND() to attribute.java