Patch Set V - Build system