Updated for 3.0.2.Final and 2.4.5.Final releases