Isolate dependencies
Remove argument order dependencies