Add pluralization support on certain commands