BugFix: classes table, classes initialization