Added some general purpose classes