Add some fields for knife command
Merge remote-tracking branch 'rt/master'