Updated to release/3.0.0 code