Move to 2.0beta7