Add better command types