Update with last changes
Fix: Do not load class like it should