#38. Option 'commands' support