Update to use double brackets in evaluation constructs