Updated for 3.0.0.Final release