Improve some design issues of stats
Add swap command