More skeleton classes