Added build recursion