Updated build and install process