Updated to V2.0 library