Improve commands flags