Final changes before 1.0.0