Added optimization todo