Updated with 2.0.1 documentation