Updated for 1.0.0-pre.4