Added some more skeleton classes