add jClass + fix tables

before refactoring