Refactored argument order dependencies