1. Add ext item in cmd for command extension
 2. Remove un-needed code