TODO See what to do for 2.0 version