Rebuild on 2.0-BETA3