Rework command scripts