FORGE-1455 - Use arguments instead of options