Adding new build infrastructure