Fixed some missing setters in a new optimization