Modified class to table