Improve dictionary command