Added skeleton classes