[fix] Better command generation