Filled out some class / table mappings