Switch to command struct