A few changes in the skill list management logic