Preparing for the next iteration 2.0.5