Final changes before v1.0