Updated for 3.0.5.3 support