Updated Buildscript and Manifest