Last changes for 1.0.