Adding some classes and later i will change some problems