added classes and libs