More changes to the Enttiy-Component system (Still Untested)