Updated to v2.0.1 new API