Added conditional and list building.