Build process adjusted