Changed all skills to add type