Add all base classes
Fix config file
Add some comments