Prep for version 1.0 updates