Added skeleton classes for primitive tools