Support RI hierarchy expansion and boolean operators