Some work on buildfile