Added build root stuff