Updates based on 1.0 changes