Define explicit dependencies
Fix Fabrication