Added solve-match command