Updated with 2.1.0 documentation