Updated Refactor for SkillsHandler