Include dependencies and fix incorrect order of arguments