added more skeleton classes