added some crucial classes
added some crucial classes