2.0.0-b3

More updates and added upgrade script