Changed some general classes with libraries.