Added all classes required (Working base)