Add Terminal class back in
Add Expressions array