Updated for version 1.0.0-alpha.7