Feature/enriched commands