FIX: Fix classes