Fix output path
Add infrastructures