Updated to the latest 2.0 version changes