[FIX] Ability to change class