Updated for changes and generated version 3.0.0