Updated with 2.0 features