[2.0] Other Changes