Adding some more skeleton classes