[FIX] scope all classes