Updated with 3.0.1 changes