Updated for v3.0.2