Use pre-defined command
Add TODO note for enhancement