Rework command argument system