Add (unfinished) strategies and slightly modify derivatives