Upgrading to sdk 2.0
Final migration to beta 2.0