Additional work on build files