Improve commands design