Optimize codes for v1.0.0-pre2