Adding more skeleton classes