Updated 2.0.0 beta