Updated with v2.0 stuff