Update for 2.0 lib