Added optimization controls