Updated packages and code to build, not tested yet