Improved buildfile