Rewrited the ShortSOPT and LongSOPT class