Updated some classes and added a plugin-system
Update 2