[Improved] Command API