Added nested boolean expressions