Fix usage logic
Improve usage logic