Modifed build process