Restructured commands.