Added class and skills factory