Restructured data to allow for commands with variable arguments