Added additional build components