Added remaining missing classes from table