Updated build and packages