Feature/improve commands