Modified build input files for clarity