Modernize build