Update for version 1.0.0-M6