add "smarter" usage parser