Modify for 1.0.0-pre1