Changed how arguments are obtained in commands by using List