Fixes ClassNotFoundException being thrown on the real world.
Overall improvements