Upgrade to 2.0.0M6
Replace deprecated method