Prep for 1.0-Alpha2 Enhancements