Adding skeleton classes, fixing parsing errors [ci skip]