Build method changes