More updates to support simple boolean operations