Some updates for 2.0