More updates for v3.0